Added config parsing