Updated command loader