Updated to comply with the latest version of Bennu Portal