Fixing EOL
Introducing data model for the actors