Correct the helper classes