Cleanup and add some context params