Added support for 20 shelf items