Updated to use Liferay 6.2 API First Release