added the suport to context mode not working yet