Added some configuration support