Move DATA_OBJECT things into separate module