rework entities to use Properties