Model datastructures added