Restructured initialization