Added few functionalities and bootstrap