Spec fixes
Extract Command object