Chnaged scope of api/base functions