added gem whenever and subscription model