Add listener and errors management