Added modification in directives and filters