Support for multiple Extra Fields!