Added classes to convert to JSON