Updates to lib more samples