Added persistance, removed unused tables