Definitions removed need t be supported still