Updated with new twitter classes