Add directives WIP
Fix issue with regexp