[STAGING] Added force validate