Added extensions, and command echoing