Fix some data object interface and clean up