major refactoring - directives added detail & list