Add framework for possible feature