Adjust to new dependencies