Added more blocks and small refactor on directives.