Use self instead of hardcoded class