Convert extra to map, so it is returned directly as json