Feature/configurable stages

Remove the `$::` for consistency.