Changes based on database bundle implementation.