Updated management commands