Add Factory, Wrapper and properties