Fixed bundle issue and added charged to API