Updated for version 2 changes