Updated initialize method