Relisting support Closes #185