Fixes for json struture and git branch