ALIEN-574: add update function and improve error system