GM Support + code refactorings