Non-Server Changes

Changes to Non-Server classes