Twitter Engine improvements