Updated code after Narvalo.Common API changes