Merge to Portlet class and Language