started adding GCM support