Updated for Latest SDK (Beta 7)