Updates, change to container and trait