Facu - PODVI - Various enhancements