Added directives, filters and much much more