Fix formatting and add OBO capability