Started adding overlay support