Feature/numeric type