Fixed setup handler and config file