Added initial methods definitions

All methods have a definition now.
Redefinition of the query generator.