Changed ObjectDefinitions to use an Object that forces it's Type and the type of the Object to be the same.