Moved static fromX functions into own factory class