Updated registration to use Commands