Added constraints for most of the new entry components.