Added skeleton and autoloading