upgraded to lastes versions, fixed messageSource issues