Updates to be in line with twitter api v1.1