Modified schema and extended DBEngine