Refactor provision commands