Added Proper Config Parsing