Final Refectoring : dependency fixing