Modified some classes