Required fields adjustment