Add partial to prevent admin exception