Added class variables and initialize method