Added more necessary initialisation