Feature/add default helpers