Custom api support