Refactor and tie in configurable options