Changed to use new Common functions.