Helpers improved