Add helpers and loging