Added generic add/remove Object functions