Resolved directive model issues, still to complete the validation.