Improved feature and context to reflect the needs of the behavior