Integrated most command structures and added spec dummies