Updated expert and library