Updated API to start to use new underlying modules