Adds again some missing code