Yes, that would be much better. This code was originally written > 2 years ago so it pre-dates the ManagerRegistry. I hope to spend more time on this soon.