Legacy considerations

roknout1294