Ref #314 - Updated other function calls