More requirements refactoring