Tidied up json storage for collections