Fix CS
Update API documentation