Added better configuration capabilities