Slight modifications in Common.cs