Changed properties to match json