Update to 2.0 and add agent