I'm not sure but maybe DataSourceAwareInterface, DataGridAwareInterface can be deprecated?