Adding Custom API support