Add overlay support