This should be easier with configuration specific code. Whenever that manages to appear.