Move this to an own factory