Moved more parts to init()