Extracted builder for Record
Replaced static access to QueryFactory with an instance method