* Preparation for some future changes (need to pass more attributes)
* Clean up of the Include-magic with more include-helper-files