Custom entity (5/23)

Custom entity