Better OAM management