Added column definitions, changes some syntax and added per-column retrieve generation