Automatically add key to context reports
Better names for contexts