Added more functionality code