Adding more model JSON support