Renamed interpreter to handler, change constructor properties for queries into properties