Updated imports for fenixedu-academic 4