Added functions and conversions