Move queries to its onw file
Use new iteration style in Messages