Solved dependency problems