Fixed #53 - More robust Property type discovery