Move additional info into context