Added property existence check