Fix api and init classes (trove)