Added skelton of new op handling