Re-designed class for the ELM interface