Improved contextification