Update module

constructors edited, now with factories