Refactorings and preparations for extend #151