Add enable/disable for gen entries