[BUGFIX] use configuration in all places

We have these wonderful Configuration ... why not use it? ;-)