Schema change + Twitter logic fix

Changes from @drofnas 's fork.