Added new functions to be more complete
Added new functions to be more complete