Made more configurable