Some changes and plugins