Added proper type and colorSpace to shape JSON