Changed structure, improved directives