Rewritten configuration to be less strict