Make CONSUMER_KEY more optional