Helpers updated