Core patch over blib.
Adding DataStructure.
Patching didn't went right, so fixing it through copy paste.