Updates to allow user of current libraries