Made stuff more configurable