Adding necessary bits and pieces