Updated to new dependencies