bundle + field rewrite