Attempt to better setup legacy