Improving some functionalities