Improve configurability