Moved initialization to bootstrapper