Fix possible warning
Implement autoloader