updated metadata management in setup