Create a data field for directives. Fix import of old style two-way repeat directives