Moved data out of data sub object for stupid template problems