Added electron support