Updated for Liferay