Custom entity (4/23)

Custom entity