Better parsing of requirements