Custom entity (3/23)

Custom entity