Updated DataStructure for default application
Fixed Windows Default App code