added NextStateOr
updated configuration tree and service definition creation
updated tests with a next state OR