Making things a bit more configurable.