Initialize command refactor