Added 2nd tier add-remove logic and simple not-null validation.