improved json builder models