Refactoring RdbQueryModel