Added few things for the view