helper classes updated