add autoproduct support