Added more misc functions