Add contex option and change exclude tag