Bugfixing and add/remove implementation in INSTEAD