support Json types in API plus move template file