Added helpers and config