Changed handling of Common.js