Move state constants from Configuration to Entry