Changed dependencies to optional