Working on the entity definitions