User Classes stuff fixed