Fixed typo
Fixed property names
Added unit as property