Configuration separated to it's own package and scanner is slightly changed