Added IsRare and Type properties and fixed loading