Added map to maintain uniqueness across notifications