made custom types more consistent