Updated methods in DBAccess and Data generator