Adding GCM support