Adapter command groups
Schema and other changes