Move seldom used methods into extension
Move seldom used methods in extension