Upgrade to be transclude-able