Refactor out extended command for now