More configurability