Updated with primefaces components