Added few functionalities / consolidated examples