Added support for storing metadata