Updated configuration handling
Minor additions