Static messageSource holder and reloading stuff was added