Adding remove, emitting events