Added configuration file, changed code to reflect configuration