changed data structures of model