New query methods added and some testing done.