added subsections to TYpes and Constraints