Updated core lib setup