New entities
Move constant to entities