Merge "Add more return types to Database class"