Moved initialization to init method