Add initial reworking of 156 to use host-meta