Some changes to expose some functions