Refactored initialization methods