Conform to current core standards