Fix JSON serialization for Index sub-classes - #11