[#4] Improved initializer