Added basic Query support

Basic query support has been added
Also added formatting for the Logger