Yes, absolutely. I already thought about a refactoring because of this. I'll try to come up with something useful. :)