some fixes data model