Get rid of factory
Use spread operator