More framework for extra features