Added compatibility outside admin