Made everything more configurable