Added following functionality