Cleaned up the constraints by adding type synonyms