Fix events and add method reset