Added more stuff to SampleLib