Extra middleman setup, cleaned up config options a lot