Adding API support