Add various check and controls on steps