added missing commponents