FLW entity class corrected