updated to work with new Common changes