Refactored to command builders