Extend core api #1