Added some things to support item generaton