Configuration adaptions