Make using PMSConfiguration consistent