Adding configuration file and more options