Updated generator to fix observation preconditions