1. Changes based on new database bundle implementation.