Made change to support the current Common instead of the Aux lib