Added directives, basic functionality