changed models to data
and fix for itemcontainers