Adding overlay support