Refactored our Datasources/Delegates