Modified some files for API