Improved trait and added local config