Added additional overrides for offsets and extras