Added backward compatibility to property check