Verify subscripition model rather than role. Fixed #18