Feature/directive fixes