Add support for shifts