Add files and implemented some directives