Adding stats and context