Api and ApiImpl All Completed
Some Small Changes