Added API tokens and mashape support.