BUG FIX: Missing class added