[JF] Updates for status validation