Adding some more missing code