Added property and value validation