Changing dependencies to more flexible.