Switching to use new API for create