Add support for links and naming containers