Add recoded API, cleanup