Added some new functionalities (not implemented yet).