Add Mapping class for executing / skipping steps
Support undefined steps