Decorator made completely static
added language .properties files