Refactored Build command