Add proper upper bounds, to follow the PVP