Modified for support lib too.