Added stuff for SQLite integration