Added add/delete-functionality