Modified dynamic property definitions again, use type property transparently for static and dynamic entities. Removed DataNode.