Feature/configurable stages