Fixed dependencies to make more sense