Fix inline yaml parsing, add predicate steps