Added a few initializations