Fix, changes old properties to methods