Added GCM related stuff