Made it more configurable.