UserDataSource and some db fixes