- Added more support for adding, removing and updating.