Added host type
Properties references not needed
Test more properties