update some namespaces and start to add poll functionality