Updated factory class
Remove query builder classes
Updated result class