Fixes

- Isolation
- Modify api extension archecture