Make options more configurable