Updated DIA and ELL implementations
Minor updates to conversions