Added some initialization code