Make use of 'extra'

Follow guidelines by using the 'extra' key from record