Add helper functins and aliases