More configurative changes