New support library, some changes