Added support for checking for duplicate shifts