Added init routines that take bundles