Refactoring and updated texts to match changed extension on bid