Refactored initializers