Added name based on metadata