Great suggestion. I've switched to a builder pattern and I think it actually simplified things a lot. Let me know what you think.