Don't use CM way of handling public api