updated dataaccess class