Change direct property access instead of set/get methods