Updated configuration scripts to be easier to be parsed