Index: branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AdministratorView.Designer.cs
===================================================================
--- branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AdministratorView.Designer.cs	(revision 4456)
+++ branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AdministratorView.Designer.cs	(revision 4466)
@@ -46,4 +46,5 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AdministratorView));
       this.tabControl = new System.Windows.Forms.TabControl();
       this.platformsTabPage = new System.Windows.Forms.TabPage();
@@ -53,10 +54,13 @@
       this.algorithmsTabPage = new System.Windows.Forms.TabPage();
       this.algorithmCollectionView = new HeuristicLab.Clients.OKB.AlgorithmCollectionView();
+      this.dataTypesTabPage = new System.Windows.Forms.TabPage();
       this.refreshButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+      this.dataTypeCollectionView = new HeuristicLab.Clients.OKB.DataTypeCollectionView();
       this.tabControl.SuspendLayout();
       this.platformsTabPage.SuspendLayout();
       this.algorithmClassesTabPage.SuspendLayout();
       this.algorithmsTabPage.SuspendLayout();
+      this.dataTypesTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -69,4 +73,5 @@
       this.tabControl.Controls.Add(this.algorithmClassesTabPage);
       this.tabControl.Controls.Add(this.algorithmsTabPage);
+      this.tabControl.Controls.Add(this.dataTypesTabPage);
       this.tabControl.Location = new System.Drawing.Point(0, 29);
       this.tabControl.Name = "tabControl";
@@ -147,7 +152,18 @@
       this.algorithmCollectionView.TabIndex = 0;
       // 
+      // dataTypesTabPage
+      // 
+      this.dataTypesTabPage.Controls.Add(this.dataTypeCollectionView);
+      this.dataTypesTabPage.Location = new System.Drawing.Point(4, 22);
+      this.dataTypesTabPage.Name = "dataTypesTabPage";
+      this.dataTypesTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.dataTypesTabPage.Size = new System.Drawing.Size(719, 380);
+      this.dataTypesTabPage.TabIndex = 3;
+      this.dataTypesTabPage.Text = "Data Types";
+      this.dataTypesTabPage.UseVisualStyleBackColor = true;
+      // 
       // refreshButton
       // 
-      this.refreshButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Refresh;
+      this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
       this.refreshButton.Location = new System.Drawing.Point(0, 0);
       this.refreshButton.Name = "refreshButton";
@@ -157,4 +173,17 @@
       this.refreshButton.UseVisualStyleBackColor = true;
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
+      // 
+      // dataTypeCollectionView
+      // 
+      this.dataTypeCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.dataTypeCollectionView.Caption = "DataTypeCollection View";
+      this.dataTypeCollectionView.Content = null;
+      this.dataTypeCollectionView.Location = new System.Drawing.Point(6, 6);
+      this.dataTypeCollectionView.Name = "dataTypeCollectionView";
+      this.dataTypeCollectionView.ReadOnly = false;
+      this.dataTypeCollectionView.Size = new System.Drawing.Size(707, 368);
+      this.dataTypeCollectionView.TabIndex = 0;
       // 
       // AdministratorView
@@ -170,4 +199,5 @@
       this.algorithmClassesTabPage.ResumeLayout(false);
       this.algorithmsTabPage.ResumeLayout(false);
+      this.dataTypesTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -185,4 +215,6 @@
     private System.Windows.Forms.TabPage platformsTabPage;
     private PlatformCollectionView platformCollectionView;
+    private System.Windows.Forms.TabPage dataTypesTabPage;
+    private DataTypeCollectionView dataTypeCollectionView;
 
   }
Index: branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AdministratorView.cs
===================================================================
--- branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AdministratorView.cs	(revision 4456)
+++ branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AdministratorView.cs	(revision 4466)
@@ -56,8 +56,10 @@
         algorithmClassCollectionView.Content = null;
         algorithmCollectionView.Content = null;
+        dataTypeCollectionView.Content = null;
       } else {
         platformCollectionView.Content = Content.Platforms;
         algorithmClassCollectionView.Content = Content.AlgorithmClasses;
         algorithmCollectionView.Content = Content.Algorithms;
+        dataTypeCollectionView.Content = Content.DataTypes;
       }
     }
@@ -69,4 +71,5 @@
       algorithmClassCollectionView.Enabled = Content != null;
       algorithmCollectionView.Enabled = Content != null;
+      dataTypeCollectionView.Enabled = Content != null;
     }
 
@@ -87,4 +90,5 @@
         algorithmClassCollectionView.Content = Content.AlgorithmClasses;
         algorithmCollectionView.Content = Content.Algorithms;
+        dataTypeCollectionView.Content = Content.DataTypes;
         refreshButton.Enabled = true;
         tabControl.Enabled = true;
Index: branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.Designer.cs
===================================================================
--- branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.Designer.cs	(revision 4456)
+++ branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.Designer.cs	(revision 4466)
@@ -49,5 +49,21 @@
       this.algorithmClassLabel = new System.Windows.Forms.Label();
       this.algorithmClassComboBox = new System.Windows.Forms.ComboBox();
+      this.usersListBox = new System.Windows.Forms.ListBox();
+      this.tabControl = new System.Windows.Forms.TabControl();
+      this.usersTabPage = new System.Windows.Forms.TabPage();
+      this.storeUsersButton = new System.Windows.Forms.Button();
+      this.refreshUsersButton = new System.Windows.Forms.Button();
+      this.dataTabPage = new System.Windows.Forms.TabPage();
+      this.fileLabel = new System.Windows.Forms.Label();
+      this.storeDataButton = new System.Windows.Forms.Button();
+      this.fileTextBox = new System.Windows.Forms.TextBox();
+      this.openFileButton = new System.Windows.Forms.Button();
+      this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+      this.dataTypeLabel = new System.Windows.Forms.Label();
+      this.dataTypeComboBox = new System.Windows.Forms.ComboBox();
       ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).BeginInit();
+      this.tabControl.SuspendLayout();
+      this.usersTabPage.SuspendLayout();
+      this.dataTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -55,10 +71,10 @@
       // 
       this.nameTextBox.Location = new System.Drawing.Point(90, 29);
-      this.nameTextBox.Size = new System.Drawing.Size(197, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(495, 20);
       // 
       // descriptionTextBox
       // 
       this.descriptionTextBox.Location = new System.Drawing.Point(90, 55);
-      this.descriptionTextBox.Size = new System.Drawing.Size(197, 20);
+      this.descriptionTextBox.Size = new System.Drawing.Size(495, 20);
       // 
       // storeButton
@@ -68,6 +84,5 @@
       // modifiedPictureBox
       // 
-      this.modifiedPictureBox.Location = new System.Drawing.Point(293, 3);
-      this.modifiedPictureBox.Size = new System.Drawing.Size(39, 130);
+      this.modifiedPictureBox.Location = new System.Drawing.Point(591, 3);
       // 
       // platformLabel
@@ -88,5 +103,5 @@
       this.platformComboBox.Location = new System.Drawing.Point(90, 81);
       this.platformComboBox.Name = "platformComboBox";
-      this.platformComboBox.Size = new System.Drawing.Size(197, 21);
+      this.platformComboBox.Size = new System.Drawing.Size(495, 21);
       this.platformComboBox.TabIndex = 6;
       this.platformComboBox.SelectedValueChanged += new System.EventHandler(this.platformComboBox_SelectedValueChanged);
@@ -109,11 +124,159 @@
       this.algorithmClassComboBox.Location = new System.Drawing.Point(90, 108);
       this.algorithmClassComboBox.Name = "algorithmClassComboBox";
-      this.algorithmClassComboBox.Size = new System.Drawing.Size(197, 21);
+      this.algorithmClassComboBox.Size = new System.Drawing.Size(495, 21);
       this.algorithmClassComboBox.TabIndex = 8;
       this.algorithmClassComboBox.SelectedValueChanged += new System.EventHandler(this.algorithmClassComboBox_SelectedValueChanged);
       // 
+      // usersListBox
+      // 
+      this.usersListBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.usersListBox.Enabled = false;
+      this.usersListBox.FormattingEnabled = true;
+      this.usersListBox.Location = new System.Drawing.Point(6, 35);
+      this.usersListBox.Name = "usersListBox";
+      this.usersListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
+      this.usersListBox.Size = new System.Drawing.Size(613, 225);
+      this.usersListBox.TabIndex = 2;
+      this.usersListBox.SelectedIndexChanged += new System.EventHandler(this.usersListBox_SelectedIndexChanged);
+      // 
+      // tabControl
+      // 
+      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.tabControl.Controls.Add(this.usersTabPage);
+      this.tabControl.Controls.Add(this.dataTabPage);
+      this.tabControl.Location = new System.Drawing.Point(0, 162);
+      this.tabControl.Name = "tabControl";
+      this.tabControl.SelectedIndex = 0;
+      this.tabControl.Size = new System.Drawing.Size(633, 292);
+      this.tabControl.TabIndex = 9;
+      // 
+      // usersTabPage
+      // 
+      this.usersTabPage.Controls.Add(this.storeUsersButton);
+      this.usersTabPage.Controls.Add(this.refreshUsersButton);
+      this.usersTabPage.Controls.Add(this.usersListBox);
+      this.usersTabPage.Location = new System.Drawing.Point(4, 22);
+      this.usersTabPage.Name = "usersTabPage";
+      this.usersTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.usersTabPage.Size = new System.Drawing.Size(625, 266);
+      this.usersTabPage.TabIndex = 0;
+      this.usersTabPage.Text = "Authorized Users";
+      this.usersTabPage.UseVisualStyleBackColor = true;
+      // 
+      // storeUsersButton
+      // 
+      this.storeUsersButton.Location = new System.Drawing.Point(86, 6);
+      this.storeUsersButton.Name = "storeUsersButton";
+      this.storeUsersButton.Size = new System.Drawing.Size(75, 23);
+      this.storeUsersButton.TabIndex = 1;
+      this.storeUsersButton.Text = "&Store";
+      this.toolTip.SetToolTip(this.storeUsersButton, "Store Authorized Users");
+      this.storeUsersButton.UseVisualStyleBackColor = true;
+      this.storeUsersButton.Click += new System.EventHandler(this.storeUsersButton_Click);
+      // 
+      // refreshUsersButton
+      // 
+      this.refreshUsersButton.Location = new System.Drawing.Point(6, 6);
+      this.refreshUsersButton.Name = "refreshUsersButton";
+      this.refreshUsersButton.Size = new System.Drawing.Size(75, 23);
+      this.refreshUsersButton.TabIndex = 0;
+      this.refreshUsersButton.Text = "&Refresh";
+      this.toolTip.SetToolTip(this.refreshUsersButton, "Refresh Authorized Users");
+      this.refreshUsersButton.UseVisualStyleBackColor = true;
+      this.refreshUsersButton.Click += new System.EventHandler(this.refreshUsersButton_Click);
+      // 
+      // dataTabPage
+      // 
+      this.dataTabPage.Controls.Add(this.dataTypeComboBox);
+      this.dataTabPage.Controls.Add(this.openFileButton);
+      this.dataTabPage.Controls.Add(this.fileTextBox);
+      this.dataTabPage.Controls.Add(this.storeDataButton);
+      this.dataTabPage.Controls.Add(this.dataTypeLabel);
+      this.dataTabPage.Controls.Add(this.fileLabel);
+      this.dataTabPage.Location = new System.Drawing.Point(4, 22);
+      this.dataTabPage.Name = "dataTabPage";
+      this.dataTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.dataTabPage.Size = new System.Drawing.Size(625, 266);
+      this.dataTabPage.TabIndex = 1;
+      this.dataTabPage.Text = "Serialized Algorithm";
+      this.dataTabPage.UseVisualStyleBackColor = true;
+      // 
+      // fileLabel
+      // 
+      this.fileLabel.AutoSize = true;
+      this.fileLabel.Location = new System.Drawing.Point(6, 38);
+      this.fileLabel.Name = "fileLabel";
+      this.fileLabel.Size = new System.Drawing.Size(26, 13);
+      this.fileLabel.TabIndex = 1;
+      this.fileLabel.Text = "&File:";
+      // 
+      // storeDataButton
+      // 
+      this.storeDataButton.Enabled = false;
+      this.storeDataButton.Location = new System.Drawing.Point(6, 6);
+      this.storeDataButton.Name = "storeDataButton";
+      this.storeDataButton.Size = new System.Drawing.Size(75, 23);
+      this.storeDataButton.TabIndex = 0;
+      this.storeDataButton.Text = "&Store";
+      this.toolTip.SetToolTip(this.storeDataButton, "Store Serialized Algorithm");
+      this.storeDataButton.UseVisualStyleBackColor = true;
+      this.storeDataButton.Click += new System.EventHandler(this.storeDataButton_Click);
+      // 
+      // fileTextBox
+      // 
+      this.fileTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.fileTextBox.Location = new System.Drawing.Point(69, 35);
+      this.fileTextBox.Name = "fileTextBox";
+      this.fileTextBox.ReadOnly = true;
+      this.fileTextBox.Size = new System.Drawing.Size(520, 20);
+      this.fileTextBox.TabIndex = 2;
+      // 
+      // openFileButton
+      // 
+      this.openFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.openFileButton.Location = new System.Drawing.Point(595, 32);
+      this.openFileButton.Name = "openFileButton";
+      this.openFileButton.Size = new System.Drawing.Size(24, 24);
+      this.openFileButton.TabIndex = 3;
+      this.openFileButton.Text = "...";
+      this.openFileButton.UseVisualStyleBackColor = true;
+      this.openFileButton.Click += new System.EventHandler(this.openFileButton_Click);
+      // 
+      // openFileDialog
+      // 
+      this.openFileDialog.FileName = "algorithm";
+      this.openFileDialog.Filter = "All Files (*.*)|*.*";
+      this.openFileDialog.Title = "Select Algorithm File";
+      // 
+      // dataTypeLabel
+      // 
+      this.dataTypeLabel.AutoSize = true;
+      this.dataTypeLabel.Location = new System.Drawing.Point(6, 64);
+      this.dataTypeLabel.Name = "dataTypeLabel";
+      this.dataTypeLabel.Size = new System.Drawing.Size(57, 13);
+      this.dataTypeLabel.TabIndex = 4;
+      this.dataTypeLabel.Text = "&DataType:";
+      // 
+      // dataTypeComboBox
+      // 
+      this.dataTypeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.dataTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.dataTypeComboBox.FormattingEnabled = true;
+      this.dataTypeComboBox.Location = new System.Drawing.Point(69, 61);
+      this.dataTypeComboBox.Name = "dataTypeComboBox";
+      this.dataTypeComboBox.Size = new System.Drawing.Size(550, 21);
+      this.dataTypeComboBox.TabIndex = 5;
+      this.dataTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.dataTypeComboBox_SelectedIndexChanged);
+      // 
       // AlgorithmView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.Controls.Add(this.tabControl);
       this.Controls.Add(this.platformComboBox);
       this.Controls.Add(this.platformLabel);
@@ -121,10 +284,11 @@
       this.Controls.Add(this.algorithmClassLabel);
       this.Name = "AlgorithmView";
-      this.Size = new System.Drawing.Size(335, 275);
-      this.Controls.SetChildIndex(this.modifiedPictureBox, 0);
+      this.Size = new System.Drawing.Size(633, 454);
       this.Controls.SetChildIndex(this.algorithmClassLabel, 0);
       this.Controls.SetChildIndex(this.algorithmClassComboBox, 0);
       this.Controls.SetChildIndex(this.platformLabel, 0);
       this.Controls.SetChildIndex(this.platformComboBox, 0);
+      this.Controls.SetChildIndex(this.tabControl, 0);
+      this.Controls.SetChildIndex(this.modifiedPictureBox, 0);
       this.Controls.SetChildIndex(this.storeButton, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
@@ -133,4 +297,8 @@
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
       ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).EndInit();
+      this.tabControl.ResumeLayout(false);
+      this.usersTabPage.ResumeLayout(false);
+      this.dataTabPage.ResumeLayout(false);
+      this.dataTabPage.PerformLayout();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -144,4 +312,17 @@
     private System.Windows.Forms.Label algorithmClassLabel;
     private System.Windows.Forms.ComboBox algorithmClassComboBox;
+    private System.Windows.Forms.ListBox usersListBox;
+    private System.Windows.Forms.TabControl tabControl;
+    private System.Windows.Forms.TabPage usersTabPage;
+    private System.Windows.Forms.Button storeUsersButton;
+    private System.Windows.Forms.Button refreshUsersButton;
+    private System.Windows.Forms.TabPage dataTabPage;
+    private System.Windows.Forms.ComboBox dataTypeComboBox;
+    private System.Windows.Forms.Button openFileButton;
+    private System.Windows.Forms.TextBox fileTextBox;
+    private System.Windows.Forms.Button storeDataButton;
+    private System.Windows.Forms.Label dataTypeLabel;
+    private System.Windows.Forms.Label fileLabel;
+    private System.Windows.Forms.OpenFileDialog openFileDialog;
 
   }
Index: branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.cs
===================================================================
--- branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.cs	(revision 4456)
+++ branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.cs	(revision 4466)
@@ -20,8 +20,11 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using System.IO;
 
 namespace HeuristicLab.Clients.OKB {
@@ -42,4 +45,5 @@
       platformComboBox.DataSource = Administrator.Instance.Platforms.ToList();
       algorithmClassComboBox.DataSource = Administrator.Instance.AlgorithmClasses.ToList();
+      dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.ToList();
     }
 
@@ -62,4 +66,7 @@
         algorithmClassComboBox.SelectedItem = Administrator.Instance.AlgorithmClasses.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
       }
+      usersListBox.DataSource = null;
+      fileTextBox.Text = "";
+      dataTypeComboBox.SelectedIndex = -1;
     }
 
@@ -68,4 +75,8 @@
       platformComboBox.Enabled = Content != null;
       algorithmClassComboBox.Enabled = Content != null;
+      refreshUsersButton.Enabled = Content != null;
+      storeUsersButton.Enabled = usersListBox.DataSource != null;
+      usersListBox.Enabled = usersListBox.DataSource != null;
+      storeDataButton.Enabled = !string.IsNullOrEmpty(fileTextBox.Text) && dataTypeComboBox.SelectedIndex != -1;
     }
 
@@ -93,4 +104,50 @@
       }
     }
+
+    private void refreshUsersButton_Click(object sender, System.EventArgs e) {
+      Guid[] ids = Administrator.Instance.GetAlgorithmUsers(Content.Id);
+      if (ids != null) {
+        List<User> users = Administrator.Instance.Users.ToList();
+        usersListBox.DataSource = users;
+        usersListBox.DisplayMember = "Name";
+        usersListBox.SelectedItems.Clear();
+        foreach (Guid id in ids)
+          usersListBox.SelectedItems.Add(users.First(u => u.Id == id));
+        usersListBox.Enabled = true;
+        storeUsersButton.Enabled = false;
+      }
+    }
+    private void storeUsersButton_Click(object sender, System.EventArgs e) {
+      if (Administrator.Instance.StoreAlgorithmUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToArray()))
+        storeUsersButton.Enabled = false;
+    }
+    private void usersListBox_SelectedIndexChanged(object sender, EventArgs e) {
+      storeUsersButton.Enabled = true;
+    }
+
+    private void storeDataButton_Click(object sender, EventArgs e) {
+      AlgorithmData data = new AlgorithmData();
+      data.AlgorithmId = Content.Id;
+      data.DataTypeId = ((DataType)dataTypeComboBox.SelectedItem).Id;
+
+      using (FileStream stream = new FileStream(fileTextBox.Text, FileMode.Open, FileAccess.Read)) {
+        byte[] bytes = new byte[stream.Length];
+        stream.Read(bytes, 0, bytes.Length);
+        stream.Close();
+        data.Data = bytes;
+      }
+
+      if (Administrator.Instance.StoreAlgorithmData(data))
+        storeDataButton.Enabled = false;
+    }
+    private void openFileButton_Click(object sender, EventArgs e) {
+      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
+        fileTextBox.Text = openFileDialog.FileName;
+        storeDataButton.Enabled = true;
+      }
+    }
+    private void dataTypeComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      storeDataButton.Enabled = !string.IsNullOrEmpty(fileTextBox.Text);
+    }
   }
 }
Index: branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeCollectionView.Designer.cs
===================================================================
--- branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeCollectionView.Designer.cs	(revision 4466)
+++ branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeCollectionView.Designer.cs	(revision 4466)
@@ -0,0 +1,53 @@
+﻿#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace HeuristicLab.Clients.OKB {
+  partial class DataTypeCollectionView {
+    /// <summary> 
+    /// Required designer variable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary> 
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing) {
+      if (disposing) {
+        if (components != null) components.Dispose();
+      }
+      base.Dispose(disposing);
+    }
+
+    #region Component Designer generated code
+
+    /// <summary> 
+    /// Required method for Designer support - do not modify 
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private void InitializeComponent() {
+      components = new System.ComponentModel.Container();
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+    }
+
+    #endregion
+  }
+}
Index: branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeCollectionView.cs
===================================================================
--- branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeCollectionView.cs	(revision 4466)
+++ branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeCollectionView.cs	(revision 4466)
@@ -0,0 +1,40 @@
+﻿#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Windows.Forms;
+using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
+
+namespace HeuristicLab.Clients.OKB {
+  [View("DataTypeCollection View")]
+  [Content(typeof(IItemCollection<DataType>), true)]
+  public partial class DataTypeCollectionView : ItemCollectionView<DataType> {
+    public DataTypeCollectionView() {
+      InitializeComponent();
+      itemsGroupBox.Text = "Data Types";
+    }
+
+    protected override DataType CreateItem() {
+      return new DataType();
+    }
+  }
+}
Index: branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.Designer.cs
===================================================================
--- branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.Designer.cs	(revision 4466)
+++ branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.Designer.cs	(revision 4466)
@@ -0,0 +1,161 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace HeuristicLab.Clients.OKB {
+  partial class DataTypeView {
+    /// <summary> 
+    /// Required designer variable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary> 
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing) {
+      if (disposing) {
+        if (components != null) components.Dispose();
+      }
+      base.Dispose(disposing);
+    }
+
+    #region Component Designer generated code
+
+    /// <summary> 
+    /// Required method for Designer support - do not modify 
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private void InitializeComponent() {
+      this.nameLabel = new System.Windows.Forms.Label();
+      this.nameTextBox = new System.Windows.Forms.TextBox();
+      this.sqlNameLabel = new System.Windows.Forms.Label();
+      this.sqlNameTextBox = new System.Windows.Forms.TextBox();
+      this.platformLabel = new System.Windows.Forms.Label();
+      this.platformComboBox = new System.Windows.Forms.ComboBox();
+      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).BeginInit();
+      this.SuspendLayout();
+      // 
+      // storeButton
+      // 
+      this.toolTip.SetToolTip(this.storeButton, "Store Data");
+      // 
+      // modifiedPictureBox
+      // 
+      this.modifiedPictureBox.Location = new System.Drawing.Point(308, 3);
+      // 
+      // nameLabel
+      // 
+      this.nameLabel.AutoSize = true;
+      this.nameLabel.Location = new System.Drawing.Point(3, 32);
+      this.nameLabel.Name = "nameLabel";
+      this.nameLabel.Size = new System.Drawing.Size(38, 13);
+      this.nameLabel.TabIndex = 1;
+      this.nameLabel.Text = "&Name:";
+      // 
+      // nameTextBox
+      // 
+      this.nameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.nameTextBox.Location = new System.Drawing.Point(71, 29);
+      this.nameTextBox.Name = "nameTextBox";
+      this.nameTextBox.Size = new System.Drawing.Size(231, 20);
+      this.nameTextBox.TabIndex = 2;
+      this.nameTextBox.TextChanged += new System.EventHandler(this.nameTextBox_TextChanged);
+      this.nameTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.nameTextBox_KeyDown);
+      // 
+      // sqlNameLabel
+      // 
+      this.sqlNameLabel.AutoSize = true;
+      this.sqlNameLabel.Location = new System.Drawing.Point(3, 58);
+      this.sqlNameLabel.Name = "sqlNameLabel";
+      this.sqlNameLabel.Size = new System.Drawing.Size(62, 13);
+      this.sqlNameLabel.TabIndex = 3;
+      this.sqlNameLabel.Text = "&SQL Name:";
+      // 
+      // sqlNameTextBox
+      // 
+      this.sqlNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.sqlNameTextBox.Location = new System.Drawing.Point(71, 55);
+      this.sqlNameTextBox.Name = "sqlNameTextBox";
+      this.sqlNameTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+      this.sqlNameTextBox.Size = new System.Drawing.Size(231, 20);
+      this.sqlNameTextBox.TabIndex = 4;
+      this.sqlNameTextBox.TextChanged += new System.EventHandler(this.sqlNameTextBox_TextChanged);
+      this.sqlNameTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sqlNameTextBox_KeyDown);
+      // 
+      // platformLabel
+      // 
+      this.platformLabel.AutoSize = true;
+      this.platformLabel.Location = new System.Drawing.Point(3, 84);
+      this.platformLabel.Name = "platformLabel";
+      this.platformLabel.Size = new System.Drawing.Size(48, 13);
+      this.platformLabel.TabIndex = 5;
+      this.platformLabel.Text = "&Platform:";
+      // 
+      // platformComboBox
+      // 
+      this.platformComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.platformComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.platformComboBox.FormattingEnabled = true;
+      this.platformComboBox.Location = new System.Drawing.Point(71, 81);
+      this.platformComboBox.Name = "platformComboBox";
+      this.platformComboBox.Size = new System.Drawing.Size(231, 21);
+      this.platformComboBox.TabIndex = 6;
+      this.platformComboBox.SelectedValueChanged += new System.EventHandler(this.platformComboBox_SelectedValueChanged);
+      // 
+      // DataTypeView
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.platformComboBox);
+      this.Controls.Add(this.sqlNameTextBox);
+      this.Controls.Add(this.platformLabel);
+      this.Controls.Add(this.sqlNameLabel);
+      this.Controls.Add(this.nameLabel);
+      this.Controls.Add(this.nameTextBox);
+      this.Name = "DataTypeView";
+      this.Size = new System.Drawing.Size(350, 229);
+      this.Controls.SetChildIndex(this.modifiedPictureBox, 0);
+      this.Controls.SetChildIndex(this.storeButton, 0);
+      this.Controls.SetChildIndex(this.nameTextBox, 0);
+      this.Controls.SetChildIndex(this.nameLabel, 0);
+      this.Controls.SetChildIndex(this.sqlNameLabel, 0);
+      this.Controls.SetChildIndex(this.platformLabel, 0);
+      this.Controls.SetChildIndex(this.sqlNameTextBox, 0);
+      this.Controls.SetChildIndex(this.platformComboBox, 0);
+      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).EndInit();
+      this.ResumeLayout(false);
+      this.PerformLayout();
+
+    }
+
+    #endregion
+
+    private System.Windows.Forms.TextBox nameTextBox;
+    private System.Windows.Forms.Label nameLabel;
+    private System.Windows.Forms.Label sqlNameLabel;
+    private System.Windows.Forms.TextBox sqlNameTextBox;
+    private System.Windows.Forms.Label platformLabel;
+    private System.Windows.Forms.ComboBox platformComboBox;
+  }
+}
Index: branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.cs
===================================================================
--- branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.cs	(revision 4466)
+++ branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.cs	(revision 4466)
@@ -0,0 +1,126 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Windows.Forms;
+using System.Linq;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
+
+namespace HeuristicLab.Clients.OKB {
+  [View("DataType View")]
+  [Content(typeof(DataType), true)]
+  public partial class DataTypeView : OKBItemView {
+    public new DataType Content {
+      get { return (DataType)base.Content; }
+      set { base.Content = value; }
+    }
+
+    public DataTypeView() {
+      InitializeComponent();
+    }
+
+    protected override void OnInitialized(System.EventArgs e) {
+      base.OnInitialized(e);
+      platformComboBox.DataSource = Administrator.Instance.Platforms.ToList();
+    }
+
+    protected override void OnContentChanged() {
+      base.OnContentChanged();
+      if (Content == null) {
+        nameTextBox.Text = string.Empty;
+        sqlNameTextBox.Text = string.Empty;
+        platformComboBox.SelectedIndex = -1;
+        if (ViewAttribute.HasViewAttribute(this.GetType()))
+          this.Caption = ViewAttribute.GetViewName(this.GetType());
+        else
+          this.Caption = "DataType View";
+      } else {
+        nameTextBox.Text = Content.Name;
+        sqlNameTextBox.Text = Content.SqlName;
+        platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
+        Caption = Content.Name;
+      }
+    }
+
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      if (Content == null) {
+        nameTextBox.Enabled = false;
+        sqlNameTextBox.Enabled = false;
+        platformComboBox.Enabled = false;
+      } else {
+        nameTextBox.Enabled = true;
+        nameTextBox.ReadOnly = ReadOnly;
+        sqlNameTextBox.Enabled = true;
+        sqlNameTextBox.ReadOnly = ReadOnly;
+        platformComboBox.Enabled = true;
+      }
+    }
+
+    protected override void OnContentPropertyChanged(string propertyName) {
+      switch (propertyName) {
+        case "Name":
+          nameTextBox.Text = Content.Name;
+          Caption = Content.Name;
+          break;
+        case "SqlName":
+          sqlNameTextBox.Text = Content.SqlName;
+          break;
+        case "PlatformId":
+          platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
+          break;
+      }
+    }
+
+    private void nameTextBox_KeyDown(object sender, KeyEventArgs e) {
+      if ((e.KeyCode == Keys.Enter) || (e.KeyCode == Keys.Return))
+        nameLabel.Focus();  // set focus on label to validate data
+      if (e.KeyCode == Keys.Escape) {
+        nameTextBox.Text = Content.Name;
+        nameLabel.Focus();  // set focus on label to validate data
+      }
+    }
+    private void nameTextBox_TextChanged(object sender, EventArgs e) {
+      if (nameTextBox.Text != Content.Name)
+        Content.Name = nameTextBox.Text;
+    }
+    private void sqlNameTextBox_KeyDown(object sender, KeyEventArgs e) {
+      if ((e.KeyCode == Keys.Enter) || (e.KeyCode == Keys.Return))
+        sqlNameLabel.Focus();  // set focus on label to validate data
+      if (e.KeyCode == Keys.Escape) {
+        sqlNameTextBox.Text = Content.SqlName;
+        sqlNameLabel.Focus();  // set focus on label to validate data
+      }
+    }
+    private void sqlNameTextBox_TextChanged(object sender, EventArgs e) {
+      if (sqlNameTextBox.Text != Content.SqlName)
+        Content.SqlName = sqlNameTextBox.Text;
+    }
+    private void platformComboBox_SelectedValueChanged(object sender, System.EventArgs e) {
+      if (Content != null) {
+        Platform selected = platformComboBox.SelectedItem as Platform;
+        if (selected != null) Content.PlatformId = selected.Id;
+      }
+    }
+  }
+}
