Feature/compatible elcodi 0 3