Changed JSON schemas

Added the bits that I needed
fixed