Made API more consistent (with ElemApi)