Added framework for two more plugins