Merge "Update documentation for database related classes"