Merge pull request #7 from yasselavila/develop

Implement and use ModelAwareInterface and ModelAwareTrait