Import zerem's modifications for support Project AX