Custom entity (21/23)

Custom entity