Added API support to Core