Refactor configurable