Bootstrap bugfix, module abstraction removed