Added electricity handlers