Updated to Dynamic metadata loading