Added some missing code