FE :: Small core module improvements