Added data object classes