Refactor: move options into Configuration.