Added various functionalities