Custom entity (13/23)

Custom entity