Enhancements based on testing. New constraint features