Updated to new API Alpha