Refactored initialize methods