Custom entity (12/23)

Custom entity