First Refactoring to support message bundle
Simple Message bundle