added more database handlers