Updating init to new 0.4 structure