Added persistence
 - Saves changes of enabled