Moved queries to korma and added log4j