Dependencies improvement