Update for latest common lib, new features