Added Upgrade and Delete functionality