Switched to plugin based architecture... Looks promising :/