Add Container property & tests