swap org and deat for CRB entries, allow custom entry_desc