Integrating notification sending with entitlement and refactoring JSON notification sending component