Continued to refactor bibframe to support all bibframe classes