Use new shiny toys from lib