Added Adding and Removing Functionality