Add full logic for F_4(q) groups + small refactoring (criterion methods)