Custom entity (8/23)

Custom entity