Fixing class and install