More configurability work