Polished some functionalities