Custom entity (20/23)

Custom entity