Updated to work with the refactored commons