Updated for SmartBag from generic template