Improve extension control