adding new @query support
removing credentials, and removing commented code
Renaming @Query full qualified name