Changed datasources return types, updated documentation