Added basic support for adding and removing