Switch to offsets, added Einstein dependency