no more hardcoded types