#157 Replacement of properties