Changes on Library-3.11 & 3.12