Introduced new object-based query creation model to simplify parameter passing