Implement wrappers and add models for entries