Separated the queries into the queryentry model class