Added work dispatcher, more configuration options