Cleanup container api
Begin to add language