Updated with add/remove methods for collections.