Added features for  more advanced collections of data and examples