Move toward configurability