Use my types for json unmarshalling
Change visibility