Removed TokenProvider class and updated yml format