Performance improvements. Caret improvements