Credits updated. Some fixes on notify structure.