Fixing smoke Distribution - Changing verify Data Signature to MapList and its implementation accordingly