Workshop for refactor