Added more units for reading properties