Refactored setup command