Update to account for RFC feedback