Added some functions implementation (Not tested)