Added property validation