I didn't want to modify or break the current coding style of the Entity