Adapt JSF module to core changes