Refactor and add permissions for BC9037 and BC9137