Fixed error about missing classes