Improve convert command