Integration of remarks from Benjamin in adminman