Added Unit initialisation