Re-factored ROM support