Update for SQLite and UniversalApp