Adding NPM badge
Adding safeguard for optional fields