Update pom + improved events