Upgraded to the new way of handling gcm

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>