stb and bundle are now included in database