Injection improvement, as_media_type
entry_point to entry_points, tighten code
Changes as per PR review #1