Added aliases. Some functions moved to aliases