Adding necessary structure