Bootstrapper

Module bootstrapper fixes