Improved dependencies
Improved classes