Added propperty support