Minor fixes. Added new Node type for property checks