Updated helper functionality