Fixing class name storage/retrival