Use new CF api and use step options