Made some stuff into directives