Added gas engine to more groups and gqueries