Add support for shift compensation