Added more database stuff