Adding some minor functionalities