Configuration.py modified to more friendly structure