Adds support for Manual Offsets