Updated to follow latest dependencies.