Improved BOM / CBOM admins