updated entity class and todos