Updated helper classes
Server update 4