#95 refactoring Extension: finished