Made the default helpers more flexible