Adding support for running from a bundle