Code reorg: Split slot out of container