Updated atabase methods