Some changes to main configuration