Changing from just JSON to support a view layer