Add autoloader & WIP on query generation