Simplified the Api class & added feedback