That is better, especially from the top-level spec perspective. The implementation still doesn't feel right, but if you believe it's the best way for you to be doing it, then I'm ok with it.