Removed old API class - Now to use ServiceFactory if needed