Finishing touches on the legacy support