Refactor interface Stage