Model imrovements