Add Ast types. A litter refactoring