Added tweakable support