Many changes to the way mappings work - SQLite integration 80% complete