Update helper classes