Implement adding and removal of state components