Mapped out more data model