Change in query method