Refactor klase Model u Message