Added wait/lock free code, more precise DIAMETER