Custom entity (7/23)

Custom entity