added missing attribute handlers