Add CTR and GCM support