Improve init command