adapt spec to simplified structs