Base: Reorganize some functions