Prefixed table names
Added new bundle