Made stuff optional and configurable