Prepared add/remove for upcoming functionality.