Added Delete and Disabled functionality