Arch: Refactored Stairs code for easier extension