[WFCORE-173] Move validation to added step