remove redundant data source
added new methods to parent class common for all controllers