Moved queries as NamedQueries