Fixed #1: Containers are now being set