Add comment
Move data method definition in TypesAndConsts