Fixed and Beautified API