Added polling and templates