Adds support for internal steps