Additional configuration options added

Ready for your review