Changes according to new libraries