Made some (more) variables configurable