Committing core helper classes