Database methods added | more database abstraction