Add skeleton of factory to save typing