refactired entities, tested - more