Added EC2, kopf & marvel plugins