Move to overlay to common