New configuration options
Helpers in helper module
Update
Small fix