Added configuration/generation hooks / Properly traited config to globals