Add Model Query and test case