Updated models and added TimeConstraints