Changed structure of requirements and settings