Refactor, moved transferobject