Generic API system added