Fix Class dependencies