CLSN-1488 Move Api Query to Builder