improve deprecated message
add deprecated comment
get context from Execution instead of API