Moved map creation to factory and changed factory name