Added model handling