Added "type" property to Track