Add enabled property to factories