Updated store to use custom directives