Added support for 'extra'
0.5.0