Better constraint management and better searching