changes to support notifications and scan types