:sun_with_face: Directives and Factory Added