issue #6  improve json structure