Updated headers and added comments
Rename query. Added extension name