Update models and add logging