Move core api within contrib module
Add new contrib api