Updated project files and fixed API classes