Re-added add, delete and move functionality