Extensions refactor