Fearture/enhance smart context