Adding in custom API support