Added more functionarities. Before Unit test