Optimisation of ApamMan for waiting stating bundles