Converted project to 2.0
Updated code to v2 SDK