Refactored to use container linking