Added some configuration possibilities