Conform to latest requirements