Fixed Model factory in constructor