Changed for Brightbox deployment