Added support for the marvel plugin