Added BatchElement

@bartekgruszka :+1: but it should be fixed in many places in the project so separate PR would be better for this kind of change