Further clarification and cleanup of DBO classes