Added necessary base functions