Enhance inventory. references #2490