Updated to match changes in Common.
Merge pull request #14 from Fraser999/MAID-567

Updated to match changes in Common.