Updated for Windows default application functionality