Added more information to JSON