NAF compatibility, logging updates and gateway parameter