Implemented new queries mechanisms