Factories && Command Improvements