Make options more easily configurable