[WIP] refactoring/new extension

It's a dev restriction ;) It will stay like that until the release.