Base: Reorganized functions into groups