Made methods more Twitter agnostic