Port validate actions to new system