--code improvement for extension release