Add factory for dummydata, cleaner controllers