#95 refactoring Extension: begin